239. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:03 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

239.1 Files compared

#LocationFileLast Modified
12021-05-13 09:09:03 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formedit.phtml2021-02-04 04:20:22 +0000

239.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted1134
Removed00

239.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

239.4 Active regular expressions

No regular expressions were active.

239.5 Comparison detail

    1 <?php
    2 /**
    3  * Copyright © Magento, Inc. All rights reserved.
    4  * See COPYING.txt for license details.
    5  */
    6 
    7 /** @var \Magento\Customer\Block\Form\Edit $block */
    8 ?>
    9 <form class="form form-edit-account" action="<?= $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" autocomplete="off">
    10     <fieldset class="fieldset info">
    11         <?= $block->getBlockHtml('formkey') ?>
    12         <legend class="legend"><span><?= $block->escapeHtml(__('Account Information')) ?></span></legend><br>
    13         <?= $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Name::class)->setObject($block->getCustomer())->toHtml() ?>
    14 
    15         <?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
    16         <?php $_taxvat = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Taxvat::class) ?>
    17         <?php $_gender = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Gender::class) ?>
    18         <?php if ($_dob->isEnabled()) : ?>
    19             <?= $_dob->setDate($block->getCustomer()->getDob())->toHtml() ?>
    20         <?php endif ?>
    21         <?php if ($_taxvat->isEnabled()) : ?>
    22             <?= $_taxvat->setTaxvat($block->getCustomer()->getTaxvat())->toHtml() ?>
    23         <?php endif ?>
    24         <?php if ($_gender->isEnabled()) : ?>
    25             <?= $_gender->setGender($block->getCustomer()->getGender())->toHtml() ?>
    26         <?php endif ?>
    27         <div class="field choice">
    28             <input type="checkbox" name="change_email" id="change-email" data-role="change-email" value="1" title="<?= $block->escapeHtmlAttr(__('Change Email')) ?>" class="checkbox" />
    29             <label class="label" for="change-email"><span><?= $block->escapeHtml(__('Change Email')) ?></span></label>
    30         </div>
    31         <div class="field choice">
    32             <input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1" title="<?= $block->escapeHtmlAttr(__('Change Password')) ?>"<?php if ($block->getChangePassword()) : ?> checked="checked"<?php endif; ?> class="checkbox" />
    33             <label class="label" for="change-password"><span><?= $block->escapeHtml(__('Change Password')) ?></span></label>
    34         </div>
    35     </fieldset>
    36 
    37     <fieldset class="fieldset password" data-container="change-email-password">
    38         <legend class="legend"><span data-title="change-email-password"><?= $block->escapeHtml(__('Change Email and Password')) ?></span></legend><br>
    39         <div class="field email required" data-container="change-email">
    40             <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
    41             <div class="control">
    42                 <input type="email" name="email" id="email" autocomplete="email" data-input="change-email" value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
    43             </div>
    44         </div>
    45         <div class="field password current required">
    46             <label class="label" for="current-password"><span><?= $block->escapeHtml(__('Current Password')) ?></span></label>
    47             <div class="control">
    48                 <input type="password" class="input-text" name="current_password" id="current-password" data-input="current-password" autocomplete="off" />
    49             </div>
    50         </div>
    51         <div class="field new password required" data-container="new-password">
    52             <label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
    53             <div class="control">
    54                 <input type="password" class="input-text" name="password" id="password"
    55                     data-password-min-length="<?= $block->escapeHtml($block->getMinimumPasswordLength()) ?>"
    56                     data-password-min-character-sets="<?= $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
    57                     data-input="new-password"
    58                     data-validate="{required:true, 'validate-customer-password':true}"
    59                     autocomplete="off" />
    60                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
    61                     <div id="password-strength-meter" class="password-strength-meter">
    62                         <?= $block->escapeHtml(__('Password Strength')) ?>:
    63                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
    64                             <?= $block->escapeHtml(__('No Password')) ?>
    65                         </span>
    66                     </div>
    67                 </div>
    68             </div>
    69         </div>
    70         <div class="field confirm password required" data-container="confirm-password">
    71             <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
    72             <div class="control">
    73                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation"
    74                     data-input="confirm-password"
    75                     autocomplete="off" />
    76             </div>
    77         </div>
    78     </fieldset>
    79     <?= $block->getChildHtml('form_additional_info') ?>
    80     <div class="actions-toolbar">
    81         <div class="primary">
    82             <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>
    83         </div>
    84         <div class="secondary">
    85             <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
    86         </div>
    87     </div>
    88 </form>
    89 <script>
    90     require([
    91         "jquery",
    92         "mage/mage"
    93     ], function($){
    94         var dataForm = $('#form-validate');
    95         var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
    96         
    97         dataForm.mage('validation', {
    98         <?php if ($_dob->isEnabled()) : ?>
    99             errorPlacement: function(error, element) {
    100                 if (element.prop('id').search('full') !== -1) {
    101                     var dobElement = $(element).parents('.customer-dob'),
    102                         errorClass = error.prop('class');
    103                     error.insertAfter(element.parent());
    104                     dobElement.find('.validate-custom').addClass(errorClass)
    105                         .after('<div class="' + errorClass + '"></div>');
    106                 }
    107                 else {
    108                     error.insertAfter(element);
    109                 }
    110             },
    111             ignore: ':hidden:not(' + ignore + ')'
    112         <?php else : ?>
    113             ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
    114         <?php endif ?>
    115         });
    116 
    117     });
    118 </script>
    119 <script type="text/x-magento-init">
    120     {
    121         "[data-role=change-email], [data-role=change-password]": {
    122             "changeEmailPassword": {
    123                 "titleChangeEmail": "<?= $block->escapeJs($block->escapeHtml(__('Change Email'))) ?>",
    124                 "titleChangePassword": "<?= $block->escapeJs($block->escapeHtml(__('Change Password'))) ?>",
    125                 "titleChangeEmailAndPassword": "<?= $block->escapeJs($block->escapeHtml(__('Change Email and Password'))) ?>"
    126             }
    127         },
    128         "[data-container=new-password]": {
    129             "passwordStrengthIndicator": {
    130                 "formSelector": "form.form-edit-account"
    131             }
    132         }
    133     }
    134 </script>

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.